Update to ver 2

Removed external dependencies
Merge branch 'master' of https://github.com/ConfigJson/dev