Merge pull request #431 from xmujay/0609_monitor