Merge branch 'release-0.2.0' into dev
Merge branch 'hotfix-0.2.1' into dev
Merge branch 'hotfix-0.2.2' into dev
Merge branch 'hotfix-0.2.2' into dev
Fix for simplejson exception
Merge branch 'hotfix-0.2.3'