Merge pull request #16 from ChinosInternationalCC/master

merge last updates from chino repo
Merge pull request #17 from ChinosInternationalCC/master

merge last updates from chino repo
fixed Syphon integration
Merge pull request #65 from ovicin/master

fixed Syphon integration