Merge pull request #3 from drandreas/upstream

Enhancements for your pull request (#556).
Merge remote-tracking branch 'remotes/openmote/master'