Final changes
Merge pull request #33 from mkirlin/mkirlin-mon

Final changes