Merge pull request #85 from stevenvanrossem/master
authorstevenvanrossem <steven.vanrossem@intec.ugent.be>
Fri, 22 Apr 2016 20:20:52 +0000 (22:20 +0200)
committerstevenvanrossem <steven.vanrossem@intec.ugent.be>
Fri, 22 Apr 2016 20:20:52 +0000 (22:20 +0200)
update monitoring features of the emulator


Trivial merge