Merge pull request #169 from stevenvanrossem/master

fix bugs in monitor commands