Added my own logger and cleaned up a bit the code
Merge branch 'master' of https://github.com/pipe01/MOPM