Merge pull request #2 from emonhub/master

fix merge conflict
Merge pull request #42 from otherWIP/master

Merge pull request #2 from emonhub/master