Merge pull request #94 from stevenvanrossem/master

prepare compute functions for monitor functionality