More changes
Merge pull request #4 from 007au/master

More changes
Merge pull request #5 from zenoio/master

More changes