Merge pull request #198 from stevenvanrossem/master

son-emu updates regarding monitoring