Merge pull request #96 from ovicin/master

loadFromJSON is working
Merge pull request #19 from ChinosInternationalCC/master

update
add setDefaultZ() method to all objects
Merge pull request #97 from kubamarkiewicz/master

add setDefaultZ() method to all objects
Merge pull request #23 from ChinosInternationalCC/master

merge updates from chino repo