Merge pull request #16 from zenoio/master

More changes
Merge pull request #17 from zenoio/gh-pages

Merge pull request #16 from zenoio/master