added 1
Merge branch 'master' of github.com:nconf/nconf into bugfix-release
added 2
added 3