Merge pull request #103 from stevenvanrossem/master

cleanup monitoring commands