Merge pull request #2 from zenoio/master

Pushing changes