performance improvements
Merge branch 'develop' of https://github.com/kubatatami/JsonCallbacks into develop