Merge branch 'master' of https://github.com/ALoecken/ActivityMonitor
Merge branch 'master' of https://github.com/ALoecken/ActivityMonitor