Merge pull request #21 from ChinosInternationalCC/master

merge last changes from chino repo
Merge pull request #22 from ChinosInternationalCC/master

last updates from chino repo
update loadJSON
loadFromJSON is working
Merge pull request #96 from ovicin/master

loadFromJSON is working