Merge pull request #16 from zenoio/master

More changes