Merge pull request #1 from aicl/develop

develop branch
Merge branch 'develop'
Merge branch 'master' of github.com:aicl/Cayita.Javascript
Merge pull request #2 from aicl/master

develop branch