Merge pull request #81 from jmccrohan/wavemon