Merge branch 'master' of https://github.com/cedric-ubs/ResMonit.git