diff --git a/.travis.yml b/.travis.yml
index 0347dd3..7ab07b5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@
 language: c
 env:
   # Build and test against the master and devel branches of Nim
-  #- BRANCH=master TODO! does not work currently, waiting for 0.15.0
+  - BRANCH=master
   - BRANCH=devel
 compiler:
   # Build and test using both gcc and clang
@@ -11,7 +11,7 @@ compiler:
 matrix:
   allow_failures:
     # Ignore failures when building against the devel Nim branch
-    # - env: BRANCH=devel TODO! ignore those once stable Nim can build NimYAML
+    - env: BRANCH=devel
   fast_finish: true
 install:
   - |
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e9dee9..74a77ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,25 @@
+### 0.7.0
+
+Features:
+
+ * Better handling of internal error messages
+ * Refactoring of low-level API:
+   * No more usage of first-class iterators (not supported for JS target)
+   * Added ability to directly use strings as input without stdlib's streams
+     (which are not available for JS)
+ * Added ability to parse octal and hexadecimal numbers
+ * Restructuring of API: now available as submodules of yaml. For backwards
+   compatibility, it is still possible to `import yaml`, which will import all
+   submodules
+ * Check for missing, duplicate and unknown fields when deserializing tuples and
+   objects
+
+Bugfixes:
+
+ * Fixed double quotes inside plain scalar (#25)
+ * Return correct line content for errors if possible (#23)
+ * Some smaller lexer/parser fixes
+
 ### 0.6.3
 
 Bugfixes:
diff --git a/README.md b/README.md
index 4d5ba7a..af0dd5d 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ nim build # build a library
 nim yamlTestSuite # execute YAML test suite (git-clones yaml-dev-kit)
 ```
 
-NimYAML needs at least Nim 0.14.0 in order to compile.
+NimYAML needs at least Nim 0.15.0 in order to compile.
 
 ## License
 
diff --git a/yaml.nimble b/yaml.nimble
index 8b60371..2b9e26e 100644
--- a/yaml.nimble
+++ b/yaml.nimble
@@ -1,10 +1,10 @@
 # Package
 
-version       = "0.6.3"
+version       = "0.7.0"
 author        = "Felix Krause"
 description   = "YAML 1.2 implementation for Nim"
 license       = "MIT"
 
 # Dependencies
 
-requires "nim >= 0.14.0"
+requires "nim >= 0.15.0"