merge pull request, closes #62

only emon changes pulled in, the rest was already in there