fix Monitor's bugs
Merge branch 'master' into dscript