Committing version three of capture monitor
Merge branch 'develop'