Merge pull request #2 from emonhub/master

fix merge conflict