Merge pull request #199 from TheBlueMatt/2018-09-184-fixed-monitor