Merge pull request #2 from zenoio/master

Pushing changes
Merge pull request #65 from Jshifter/master

Merge pull request #2 from zenoio/master