Finish Release-2.1.0
Merge pull request #8 from Celestibytes/master

Master
Finish Hotfix-2.1.1
Update to new json style
Bump version
Finish Release-2.2.0