Merge pull request #85 from stevenvanrossem/master

update monitoring features of the emulator