Merge pull request #154 from stevenvanrossem/master

fix some bugs in monitoring rest api