Before merge
Merge branch 'master' of https://github.com/blasd/apex
Simplify modules dependendies
Fix partial monitoring