diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 0000000..0b76b29
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,33 @@
+module.exports = {
+    'env': {
+        'commonjs': true,
+        'es6': true,
+        'node': true
+    },
+    'extends': 'eslint:recommended',
+    'globals': {
+        'Atomics': 'readonly',
+        'SharedArrayBuffer': 'readonly'
+    },
+    'parserOptions': {
+        'ecmaVersion': 2018
+    },
+    'rules': {
+        'indent': [
+            'error',
+            4
+        ],
+        'linebreak-style': [
+            'error',
+            'unix'
+        ],
+        'quotes': [
+            'error',
+            'single'
+        ],
+        'semi': [
+            'error',
+            'always'
+        ]
+    }
+};
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index cdf8037..bb14eca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 node_modules/
 coverage
 npm-debug.log
+.nyc_output/
+package-lock.json
+
diff --git a/.mocharc.js b/.mocharc.js
new file mode 100644
index 0000000..1bb971f
--- /dev/null
+++ b/.mocharc.js
@@ -0,0 +1,5 @@
+module.exports = {
+  extension: ['.spec.js'],
+  recursive: true,
+  reporter: 'spec'
+}
diff --git a/.travis.yml b/.travis.yml
index 7ab9726..0570f30 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: node_js
 node_js:
-  - 0.10
+  - 6
 script: "npm run-script travis"
 after_success: "<coverage/lcov.info ./node_modules/coveralls/bin/coveralls.js"
diff --git a/README.md b/README.md
index 8918210..20dc801 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ structure like this is used:
  * `project/config/default.cjson` has project-wide defaults.
  * `project/config/{dev,test,staging,production}.cjson` inherits the default
    and set keys relevant to respective environments
- * `project/config/$HOSTNAME.cjson` (optinal) machine-specifics that inherit
+ * `project/config/$HOSTNAME.cjson` (optional) machine-specifics that inherit
    from the relevant environment-file.
  * `/etc/$WORKNAME/$PROJECTNAME-secrets.cjson` inherits the machine-specific
    things and typically adds production secrets.
@@ -189,6 +189,34 @@ You can also filter out values in the `#public` blob with the `--public` flag.
 }
 ```
 
+## Support for relaxed JSON format
+**Reference:** https://www.npmjs.com/package/relaxed-json
+
+```js
+// Contents of config.rjson
+{
+  someConfig: 'someValue'
+}
+```
+
+### In terminal:
+```sh
+ $ oconf --relaxed config.rjson
+{
+    "someConfig": "someValue"
+}
+```
+
+In Node JS:
+```js
+var oconf = require('oconf');
+var data = oconf.load('config.rjson', { relaxed: true });
+console.log(JSON.stringify(data));
+
+// Output:
+{"someConfig": "someValue"}
+```
+
 ## Tests
 
 Download/clone, run `npm install` and then `npm test`.
diff --git a/bin/oconf b/bin/oconf
index 1850979..26a9694 100755
--- a/bin/oconf
+++ b/bin/oconf
@@ -1,54 +1,30 @@
 #!/usr/bin/env node
-
-var oconf = require('../lib/index');
-var util = require('util');
-
-var argp = require('optimist')
-    .usage('Usage: $0 [--lint|--extract-option <option> [--allow-missing-option][--option-as-json]] <file>')
-    .option('help', {
-        alias: 'h',
-        description: 'This help text.',
-        type: 'boolean'
-    })
-    .option('ignore', {
-        alias: 'i',
-        description: 'Absolute path or glob pattern for ignoring included files.',
-        type: 'string'
-    })
-    .option('lint', {
-        alias: 'l',
-        description: 'Lint the input file and report any errors.',
-        type: 'boolean'
-    })
-    .option('extract-option', {
-        alias: 'o',
-        description: 'Extract the value of an option.',
-        type: 'string'
-	})
-    .option('option-as-json', {
-        alias: 'j',
-        description: 'The extracted value will be extracted as JSON.',
-        type: 'boolean'
-    })
-    .option('public', {
-        alias: 'p',
-        description: 'Only values in #public objects will be extracted.',
-        type: 'boolean'
-    })
-    .option('json', { type: 'boolean' })
-    .option('allow-missing-option', {
-        alias: 'm',
-        description: 'Do not fail when no such value is present.',
-        type: 'boolean'
-    })
-    .option('allowmissing', { type: 'boolean' });
-
-var argv = argp.argv;
+const oconf = require('../lib/index');
+const { Command } = require('commander');
+const program = new Command();
+
+program
+    .name('oconf')
+    .usage('[--lint|--extract-option <option> [--allow-missing-option][--option-as-json]] <file>')
+    .option('-h, --help', 'This help text.')
+    .option('-i, --ignore <path>', 'Absolute path or glob pattern for ignoring included files.')
+    .option('-l, --lint', 'Lint the input file and report any errors.')
+    .option('-r, --relaxed', 'Use relaxed JSON format.')
+    .option('-p, --public', 'Only values in #public objects will be extracted.')
+    .option('-o, --extract-option <option>', 'Extract the value of an option.')
+    .option('-j, --option-as-json', 'The extracted value will be extracted as JSON.')
+    .option('-m, --allow-missing-option', 'Do not fail when no such value is present.')
+    .option('--json', 'JSON output.')
+    .option('--allowmissing', 'Allow missing options.')
+    .parse();
+
+const argv = program.opts();
+argv._ = program.args;
 
 // This is needed as optimist will not force exit when --help is
 // passed on it's own, and we want it to.
 if (argv.help || argv._.length < 1) {
-    argp.showHelp();
+    program.outputHelp();
     process.exit(0);
 }
 
@@ -56,22 +32,22 @@ if (argv.help || argv._.length < 1) {
 // This is here for backwards compatibility. Used to be an okay
 // flag. We can add a deprecation warning later.
 if (argv['json']) {
-    argv['option-as-json'] = true;
+    argv['optionAsJson'] = true;
 }
 if (argv['allowmissing']) {
-    argv['allow-missing-option'] = true;
+    argv['allowMissingOption'] = true;
 }
 //////////////////////////////////////////////////////////////////
 
-if (!argv['extract-option'] && (argv['option-as-json'] || argv['allow-missing-option'])) {
-    if (argv['option-as-json']) {
+if (!argv['extractOption'] && (argv['optionAsJson'] || argv['allowMissingOption'])) {
+    if (argv['optionAsJson']) {
         console.error('The flag --option-as-json does not make sense without the --extract-option flag.');
-    } else if (argv['allow-missing-option']) {
+    } else if (argv['allowMissingOption']) {
         console.error('The flag --allow-missing-option does not make sense without the --extract-option flag.');
     }
-
+    
     console.error('');
-    argp.showHelp();
+    program.outputHelp();
     process.exit(1);
 }
 
@@ -86,11 +62,11 @@ function _getKey(keyname, testObj) {
         return {error: 'Not found'};
     }
 
-    var key = keyname.shift();
+    const key = keyname.shift();
 
     // Is it an object -- and does it have the key
     if (testObj !== new Object(testObj) || !(key in testObj)) {
-        if (argv['allow-missing-option']) {
+        if (argv['allowMissingOption']) {
             process.exit(0);
         }
         throw new Error('Key ' + key + ' not found in ' + JSON.stringify(testObj));
@@ -105,10 +81,10 @@ function _getKey(keyname, testObj) {
     return testObj[key];
 }
 
-var config;
+let config;
 
 try {
-    config = oconf.load(argv._, { ignore: argv.ignore, public: argv.public });
+    config = oconf.load(argv._, { ignore: argv.ignore, public: argv.public, relaxed: argv.relaxed });
 } catch (error) {
     console.error("Error:", error.message);
     process.exit(1);
@@ -119,25 +95,25 @@ if (argv.lint) {
     process.exit(0);
 }
 
-if (argv['extract-option']) {
+if (argv['extractOption']) {
     try {
-        var data = config;
+        let data = config;
 
-        data = _getKey(argv['extract-option'], data);
+        data = _getKey(argv['extractOption'], data);
 
-        if (!argv['option-as-json'] && Array.isArray(data)) {
+        if (!argv['optionAsJson'] && Array.isArray(data)) {
             data = data.join(' ');
-        } else if (argv['option-as-json'] || (typeof data !== 'string' && typeof data !== 'number')) {
+        } else if (argv['optionAsJson'] || (typeof data !== 'string' && typeof data !== 'number')) {
             data = JSON.stringify(data, false, 4);
         }
 
-        util.puts(data);
+        console.log(data);
     } catch (error) {
-        if (!argv['allow-missing-option']) {
+        if (!argv['allowMissingOption']) {
             console.error("Error:", error.message);
             process.exit(1);
         }
     }
 } else {
-    util.puts(JSON.stringify(config, false, 4));
+    console.log(JSON.stringify(config, false, 4));
 }
diff --git a/lib/index.d.ts b/lib/index.d.ts
new file mode 100644
index 0000000..a15a19b
--- /dev/null
+++ b/lib/index.d.ts
@@ -0,0 +1,30 @@
+declare module "oconf" {
+    interface OconfOptions {
+        /**
+         * Current working directory.
+         */
+        cwd?: string;
+
+        /**
+         * Use relaxed JSON format.
+         */
+        relaxed?: boolean;
+
+        /**
+         * Absolute path or glob pattern for ignoring included files.
+         */
+        ignore?: string | string[];
+
+        /**
+         * Only values in #public objects will be extracted.
+         */
+        public?: boolean;
+    }
+
+    interface Oconf {
+        load(rootFileName: string | string[], options?: OconfOptions): any;
+    }
+
+    const oconf: Oconf;
+    export = oconf;
+}
diff --git a/lib/index.js b/lib/index.js
index f6f2837..8715ce9 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -3,13 +3,17 @@
  */
 
 var Path = require('path'),
+    fs = require('fs'),
     minimatch = require('minimatch'),
     _ = require('underscore'),
+    rjson = require('relaxed-json'),
     cjson = require('cjson');
 
 module.exports.load = function load(rootFileName, options) {
     options = options || {};
 
+    var relaxed = options.relaxed || false;
+
     var cwd = options.cwd || process.cwd();
     var isIgnored = (typeof options.ignore !== 'undefined' ? _.flatten([options.ignore]) : []).map(function (ignoreString) {
         return function (string) {
@@ -19,7 +23,7 @@ module.exports.load = function load(rootFileName, options) {
         return function (string) { return currentValue(string) || previousValue(string); };
     }, function () { return false; });
 
-    var loadedAbsoluteFileNames = []; // Do some housekeeping to avoid cycles
+    var stack = []; // Do some housekeeping to avoid cycles
 
     if (Array.isArray(rootFileName)) {
         var config = {};
@@ -38,8 +42,11 @@ module.exports.load = function load(rootFileName, options) {
         if (typeof obj === 'object' && obj !== null) {
             var publicObj = Array.isArray(obj) ? [] : {};
 
+            var hashPublicSuffixedKeys = [];
             Object.keys(obj).forEach(function (key) {
-                if (key !== '#public') {
+                if (/.+#public$/.test(key)) {
+                    hashPublicSuffixedKeys.push(key);
+                } else if (key !== '#public') {
                     // Have to extract public and non-public keys separately, otherwise we lose information
                     var resolvedPublic = resolvePublic(obj[key], false, true);
                     if (typeof resolvedPublic === 'object' && resolvedPublic !== null && Object.keys(resolvedPublic).length > 0) {
@@ -49,6 +56,17 @@ module.exports.load = function load(rootFileName, options) {
                     obj[key] = resolvePublic(obj[key], false, false);
                 }
             });
+            if (hashPublicSuffixedKeys.length > 0) {
+                obj['#public'] = obj['#public'] || {};
+                hashPublicSuffixedKeys.forEach(function (hashPublicSuffixedKey) {
+                    var keyWithoutSuffix = hashPublicSuffixedKey.replace(/#public$/, '');
+                    if (keyWithoutSuffix in obj['#public']) {
+                        throw new Error(hashPublicSuffixedKey + ' clashes with ' + keyWithoutSuffix + ' inside #public block');
+                    }
+                    obj['#public'][keyWithoutSuffix] = obj[hashPublicSuffixedKey];
+                    delete obj[hashPublicSuffixedKey];
+                });
+            }
 
             if (typeof obj['#public'] !== 'undefined') {
                 if (!(typeof obj['#public'] === 'object' && obj['#public'] !== null && !Array.isArray(obj['#public']))) {
@@ -57,7 +75,7 @@ module.exports.load = function load(rootFileName, options) {
 
                 Object.keys(obj['#public']).forEach(function (key) {
                     if (key in obj) {
-                        throw new Error('Unsupported combination of public and non-public properties, check your tree structure');
+                        throw new Error('Unsupported combination of public and non-public properties for key "' + key + '", check your tree structure: ' + JSON.stringify(obj));
                     }
 
                     if (obj['#public'][key] !== 'undefined') {
@@ -85,11 +103,18 @@ module.exports.load = function load(rootFileName, options) {
     return resolvePublic((function readFileAndResolveIncludes(fileName) {
         var absoluteFileName = Path.resolve(cwd, fileName);
 
-        if (loadedAbsoluteFileNames.indexOf(absoluteFileName) !== -1) {
-            throw new Error("Loop in loaded files: \n\t→ " + loadedAbsoluteFileNames.join("\n\t→ "));
+        if (stack.indexOf(absoluteFileName) !== -1) {
+            throw new Error('Loop in loaded files: \n\t→ ' + stack.join('\n\t→ '));
         }
 
-        loadedAbsoluteFileNames.push(absoluteFileName);
+        stack.push(absoluteFileName);
+
+        var loadedData = null;
+        if (relaxed) {
+            loadedData = rjson.parse(fs.readFileSync(absoluteFileName, 'utf8'));
+        } else {
+            loadedData = cjson.load(absoluteFileName);
+        }
 
         return (function resolveIncludes(obj) {
             if (Array.isArray(obj)) {
@@ -110,7 +135,9 @@ module.exports.load = function load(rootFileName, options) {
                     obj[key] = resolveIncludes(obj[key]);
                 });
             }
+            stack.pop();
             return obj;
-        }(cjson.load(absoluteFileName)));
+
+        }(loadedData));
     }(rootFileName)), true, options.public);
 };
diff --git a/package.json b/package.json
index caa0605..e6afd06 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "author": "Morten Siebuhr <sbhr@sbhr.dk>",
   "name": "oconf",
   "description": "Configuration",
-  "version": "4.1.0",
+  "version": "5.7.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/One-com/node-oconf.git"
@@ -13,6 +13,7 @@
   ],
   "homepage": "https://github.com/One-com/node-oconf",
   "main": "lib/index.js",
+  "types": "lib/index.d.ts",
   "keywords": [
     "cjson",
     "config",
@@ -27,26 +28,26 @@
     "oconf-extract-option": "bin/oconf-extract-option"
   },
   "scripts": {
-    "coverage": "NODE_ENV=development istanbul cover --include-all-sources _mocha -- --reporter dot",
-    "lint": "jshint . && jscs .",
-    "test": "mocha",
+    "coverage": "NODE_ENV=development nyc npm test --reporter=dot",
+    "lint": "eslint .",
+    "test": "mocha test",
     "travis": "npm run lint && npm run test && npm run coverage"
   },
   "dependencies": {
     "async": "0.9.0",
-    "cjson": "0.3.1",
-    "glob": "5.0.1",
-    "minimatch": "2.0.1",
-    "optimist": "0.6.1",
+    "cjson": "^0.5.0",
+    "commander": "^12.1.0",
+    "glob": "^7.1.3",
+    "minimatch": "^3.0.4",
     "passerror": "1.1.0",
-    "underscore": "*"
+    "relaxed-json": "1.0.3",
+    "underscore": "^1.13.6"
   },
   "devDependencies": {
-    "coveralls": "2.11.2",
-    "istanbul": "0.3.5",
-    "jscs": "1.10.0",
-    "jshint": "2.5.11",
-    "mocha": "*",
-    "unexpected": "10.8.1"
+    "coveralls": "^3.0.3",
+    "eslint": "^5.16.0",
+    "mocha": "^10.2.0",
+    "nyc": "^14.0.0",
+    "unexpected": "10.15.0"
   }
 }
diff --git a/test/bin/oconf-lint.spec.js b/test/bin/oconf-lint.spec.js
index 6444dd8..2561e82 100644
--- a/test/bin/oconf-lint.spec.js
+++ b/test/bin/oconf-lint.spec.js
@@ -4,7 +4,7 @@ var expect = require('unexpected');
 
 var pathToBin = require('path').resolve(__dirname, '../../bin/', 'oconf-lint');
 
-expect.addAssertion('when oconf-linted', function (expect, subject, value) {
+expect.addAssertion('when oconf-linted', function (expect, subject) {
     this.errorMode = 'nested';
     var that = this;
     return expect.promise(function (resolve, reject) {
@@ -55,10 +55,9 @@ describe('bin/oconf-lint', function () {
             code: 1,
             stdout: '',
             stderr: [
-                'Error: Parse error on line 2:',
-                '{    "foo": "bar}',
-                '------------^',
-                "Expecting 'STRING', 'NUMBER', 'NULL', 'TRUE', 'FALSE', '{', '[', got 'undefined'",
+                'Error: Unexpected token \'}\' at 2:17',
+                '    "foo": "bar',
+                '               ^',
                 'File: "' + filePath + '"',
                 ''
             ].join('\n')
diff --git a/test/bin/oconf.spec.js b/test/bin/oconf.spec.js
index a8a2343..d9b944c 100644
--- a/test/bin/oconf.spec.js
+++ b/test/bin/oconf.spec.js
@@ -9,13 +9,13 @@ function formattedJson(obj) {
 }
 
 function testFile(fileName) {
-    if (!(/\.cjson$/.test(fileName))) {
+    if (!(/\.cjson$/.test(fileName)) && !(/\.rjson$/.test(fileName))) {
         fileName += '.cjson';
     }
     return require('path').resolve(__dirname, '..', 'files', fileName);
 }
 
-expect.addAssertion('when passed as arguments to oconf', function (expect, subject, value) {
+expect.addAssertion('when passed as arguments to oconf', function (expect, subject) {
     this.errorMode = 'nested';
     var that = this;
     return expect.promise(function (resolve, reject) {
@@ -49,8 +49,8 @@ describe('bin/oconf', function () {
             return expect(testFile('base'), 'when passed as arguments to oconf', 'to satisfy', {
                 err: null,
                 stdout: formattedJson({
-                    foo: "overwrite this",
-                    what: "this is from default.cjson."
+                    foo: 'overwrite this',
+                    what: 'this is from default.cjson.'
                 }),
                 stderr: ''
             });
@@ -60,23 +60,41 @@ describe('bin/oconf', function () {
                 err: null,
                 stdout: formattedJson({
                     foo: {
-                        bar: "qux"
+                        bar: 'qux'
                     },
-                    what: "this is from default.cjson."
+                    what: 'this is from default.cjson.'
                 }),
                 stderr: ''
             });
         });
+        describe('--relaxed flag', function () {
+            it('should support including multiple files (including relaxed json format), and print the resolved json structure to stdout', function () {
+                return expect([
+                    '--relaxed',
+                    testFile('extend-base.rjson'),
+                    testFile('deep')
+                ], 'when passed as arguments to oconf', 'to satisfy', {
+                    err: null,
+                    stdout: formattedJson({
+                        foo: {
+                            bar: 'qux'
+                        },
+                        what: 'this is from default.cjson.'
+                    }),
+                    stderr: ''
+                });
+            });
+        });
         it('should fail when asked for nonexistant file', function () {
             return expect(testFile('nonExistent'), 'when passed as arguments to oconf', 'to satisfy', {
                 err: expect.it('to be an', Error),
-                stderr: expect.it('to match', /Error: ENOENT, no such file or directory/)
+                stderr: expect.it('to match', /ENOENT/)
             });
         });
         it('should fail when resolved file includes non existing file', function () {
             return expect(testFile('includeNonExistentFile'), 'when passed as arguments to oconf', 'to satisfy', {
                 err: expect.it('to be an', Error),
-                stderr: expect.it('to match', /Error: ENOENT, no such file or directory/)
+                stderr: expect.it('to match', /ENOENT/)
                     .and('to match', /nonExistentFile.cjson/)
             });
         });
@@ -99,8 +117,8 @@ describe('bin/oconf', function () {
             return expect('--help', 'when passed as arguments to oconf', 'to satisfy', {
                 err: null,
                 code: 0,
-                stdout: '',
-                stderr: expect.it('to match', /Options/)
+                stdout: expect.it('to match', /Options/),
+                stderr: ''
             });
         });
     });
@@ -124,10 +142,9 @@ describe('bin/oconf', function () {
                 err: expect.it('to be an', Error),
                 stdout: '',
                 stderr: [
-                    'Error: Parse error on line 2:',
-                    '{    "foo": "bar}',
-                    '------------^',
-                    "Expecting 'STRING', 'NUMBER', 'NULL', 'TRUE', 'FALSE', '{', '[', got 'undefined'",
+                    'Error: Unexpected token \'}\' at 2:17',
+                    '    "foo": "bar',
+                    '               ^',
                     'File: "' + filePath + '"',
                     ''
                 ].join('\n')
diff --git a/test/files/extend-base.rjson b/test/files/extend-base.rjson
new file mode 100644
index 0000000..247c378
--- /dev/null
+++ b/test/files/extend-base.rjson
@@ -0,0 +1,7 @@
+/*
+ * Example rjson file.
+ */
+{
+	foo: "bar",
+	"#include": "./base.cjson"
+}
diff --git a/test/fixtures/include-non-loopy.cjson b/test/fixtures/include-non-loopy.cjson
new file mode 100644
index 0000000..e7260dc
--- /dev/null
+++ b/test/fixtures/include-non-loopy.cjson
@@ -0,0 +1,8 @@
+{
+  "foo": {
+    "#include": "non-loopy.cjson"
+  },
+  "bar": {
+    "#include": "non-loopy.cjson"
+  }
+}
diff --git a/test/fixtures/invalid-public.cjson b/test/fixtures/invalid-public.cjson
new file mode 100644
index 0000000..afd756e
--- /dev/null
+++ b/test/fixtures/invalid-public.cjson
@@ -0,0 +1,8 @@
+{
+  "foo": {
+    "#public": {
+      "foo": 123
+    },
+    "foo#public": 456
+  }
+}
diff --git a/test/fixtures/non-loopy.cjson b/test/fixtures/non-loopy.cjson
new file mode 100644
index 0000000..fc185cd
--- /dev/null
+++ b/test/fixtures/non-loopy.cjson
@@ -0,0 +1,3 @@
+{
+  "abc": 123
+}
diff --git a/test/fixtures/public-block-include-public-key.cjson b/test/fixtures/public-block-include-public-key.cjson
new file mode 100644
index 0000000..6b79b4f
--- /dev/null
+++ b/test/fixtures/public-block-include-public-key.cjson
@@ -0,0 +1,8 @@
+{
+  "#include": "/testdata/included.cjson",
+  "foo": {
+    "#public": {
+      "abc": 123
+    }
+  }
+}
diff --git a/test/fixtures/public-block.cjson b/test/fixtures/public-block.cjson
new file mode 100644
index 0000000..e288264
--- /dev/null
+++ b/test/fixtures/public-block.cjson
@@ -0,0 +1,7 @@
+{
+  "foo": {
+    "#public": {
+      "abc": 456
+    }
+  }
+}
diff --git a/test/fixtures/public-key-include-public-block.cjson b/test/fixtures/public-key-include-public-block.cjson
new file mode 100644
index 0000000..fb41f47
--- /dev/null
+++ b/test/fixtures/public-key-include-public-block.cjson
@@ -0,0 +1,6 @@
+{
+  "#include": "public-block.cjson",
+  "foo": {
+      "abc#public": 123
+  }
+}
diff --git a/test/fixtures/public-key.cjson b/test/fixtures/public-key.cjson
new file mode 100644
index 0000000..37fb157
--- /dev/null
+++ b/test/fixtures/public-key.cjson
@@ -0,0 +1,5 @@
+{
+  "foo": {
+    "abc#public": 456
+  }
+}
diff --git a/test/fixtures/valid-public.cjson b/test/fixtures/valid-public.cjson
new file mode 100644
index 0000000..b372d24
--- /dev/null
+++ b/test/fixtures/valid-public.cjson
@@ -0,0 +1,6 @@
+{
+  "foo": {
+    "bar#public": 123,
+    "quux": 456
+  }
+}
diff --git a/test/lib/index.spec.js b/test/lib/index.spec.js
index 258839f..9fa30b3 100644
--- a/test/lib/index.spec.js
+++ b/test/lib/index.spec.js
@@ -1,9 +1,10 @@
 /*global describe, it, before*/
-var expect = require('unexpected');
+var pathModule = require('path');
+var expect = require('unexpected').clone();
 var oconf = require('../../lib/index');
 
 function testFile(filename) {
-    return require('path').resolve(__dirname, '..', 'files', filename);
+    return pathModule.resolve(__dirname, '..', 'files', filename);
 }
 
 describe('Basic tests', function () {
@@ -113,11 +114,32 @@ describe('#include behaviour', function () {
             }, 'to throw', /^Loop in loaded files/);
         });
     });
+
+    it('should support the same file being included multiple times when there are no loops', function () {
+        expect(
+            oconf.load(
+                pathModule.resolve(
+                    __dirname,
+                    '../fixtures/include-non-loopy.cjson'
+                )
+            ),
+            'to equal',
+            {
+                foo: {
+                    abc: 123
+                },
+                bar: {
+                    abc: 123
+                }
+            }
+        );
+    });
+
     describe('includeNonExistentFile.cjson', function () {
         it('should throw an error when nonExistentFile.cjson is not ignored', function () {
             expect(function () {
                 oconf.load(testFile('includeNonExistentFile.cjson'));
-            }, 'to throw', /^ENOENT, no such file or directory/);
+            }, 'to throw', /^ENOENT/);
         });
         it('should not throw an error when nonExistentFile.cjson is ignored', function () {
             expect(function () {
@@ -149,7 +171,7 @@ describe('#include behaviour', function () {
         it('should throw an error when ignoring by glob but including file not matched by glob', function () {
             expect(function () {
                 oconf.load(testFile('includeNonExistentFile.cjson'), { ignore: testFile('foo/*cjson') });
-            }, 'to throw', /^ENOENT, no such file or directory/);
+            }, 'to throw', /^ENOENT/);
         });
     });
 });
@@ -179,12 +201,12 @@ describe('#public behaviour', function () {
             });
             it('should fold the #public properties down into the base structure', function () {
                 expect(data, 'to equal', {
-                    foo: "do not expose to public",
+                    foo: 'do not expose to public',
                     bar: {
-                        quux: "super secret"
+                        quux: 'super secret'
                     },
                     hello: {
-                        earth: "mostly harmless",
+                        earth: 'mostly harmless',
                         answer: 42
                     },
                     '#public': {
@@ -224,7 +246,7 @@ describe('#public behaviour', function () {
             before(function () {
                 data = oconf.load(testFile('array-with-object-with-array-with-object-with-public.cjson'));
             });
-            it.skip('should fold the #public properties down into the base structure', function () {
+            it('should fold the #public properties down into the base structure', function () {
                 expect(data, 'to exhaustively satisfy', {
                     0: {
                         foo: [
@@ -275,12 +297,12 @@ describe('#public behaviour', function () {
             });
             it('should overwrite the included #public property with our value', function () {
                 expect(data, 'to equal', {
-                    foo: "do not expose to public",
+                    foo: 'do not expose to public',
                     bar: {
-                        quux: "super secret"
+                        quux: 'super secret'
                     },
                     hello: {
-                        earth: "mostly harmless",
+                        earth: 'mostly harmless',
                         answer: 'Insufficient data for meaningful answer'
                     },
                     '#public': {
@@ -376,7 +398,7 @@ describe('#public behaviour', function () {
         it('throws an error', function () {
             expect(function () {
                 oconf.load(testFile('public-array.cjson'));
-            }, 'to throw', /^\#public must always be an object/);
+            }, 'to throw', /^#public must always be an object/);
         });
     });
 
@@ -384,7 +406,91 @@ describe('#public behaviour', function () {
         it('throws an error', function () {
             expect(function () {
                 oconf.load(testFile('public-non-object.cjson'));
-            }, 'to throw', /^\#public must always be an object/);
+            }, 'to throw', /^#public must always be an object/);
+        });
+    });
+
+    describe('with a #public-suffixed key', function () {
+        it('treats the key as if contained inside a #public block', function () {
+            expect(
+                oconf.load(
+                    pathModule.resolve(
+                        __dirname,
+                        '../fixtures/valid-public.cjson'
+                    )
+                ),
+                'to equal',
+                {
+                    foo: {
+                        bar: 123,
+                        quux: 456
+                    },
+                    '#public': {
+                        foo: {
+                            bar: 123
+                        }
+                    }
+                }
+            );
+        });
+
+        it('complains if a #public-suffixed key shadows an entry inside a #public block', function () {
+            expect(
+                function () {
+                    oconf.load(
+                        pathModule.resolve(
+                            __dirname,
+                            '../fixtures/invalid-public.cjson'
+                        )
+                    );
+                },
+                'to throw',
+                new Error('foo#public clashes with foo inside #public block')
+            );
+        });
+
+        it.skip('should allow overwriting a key inside a #public block with a #public-suffixed key of the same name', function () {
+            expect(
+                oconf.load(
+                    pathModule.resolve(
+                        __dirname,
+                        '../fixtures/public-key-include-public-block.cjson'
+                    )
+                ),
+                'to equal',
+                {
+                    foo: {
+                        abc: 123
+                    },
+                    '#public': {
+                        foo: {
+                            abc: 123
+                        }
+                    }
+                }
+            );
+        });
+
+        it.skip('should allow overwriting a #public-suffixed key with a key of the same name inside a #public block', function () {
+            expect(
+                oconf.load(
+                    pathModule.resolve(
+                        __dirname,
+                        '../fixtures/public-block-include-public-key.cjson'
+                    )
+                ),
+                'to equal',
+                {
+                    foo: {
+                        abc: 123
+                    },
+                    '#public': {
+                        foo: {
+                            abc: 123
+                        }
+                    }
+                }
+            );
         });
     });
 });
diff --git a/test/lib/lint.spec.js b/test/lib/lint.spec.js
index c95d4c6..f992545 100644
--- a/test/lib/lint.spec.js
+++ b/test/lib/lint.spec.js
@@ -33,7 +33,7 @@ describe('lib/lint', function () {
     });
     it('should complain when given an invalid file', function (done) {
         lint(testData('invalid.cjson'), function (err) {
-            expect(err, 'to be an error', /^Parse error on line 2:/);
+            expect(err, 'to be an error', /^Unexpected token '.' at 2:/);
             done();
         });
     });
@@ -47,7 +47,7 @@ describe('lib/lint', function () {
         it('should complain if at least one file is invalid', function (done) {
             lint(testData('invalidDirectory'), function (err) {
                 expect(err, 'to satisfy', {
-                    message: /^Parse error on line 2:/,
+                    message: /^Unexpected token '.' at 2:/,
                     file: /invalidDirectory\/2.cjson$/
                 });
                 done();