Merge pull request #44 from jryberg/master

Updated Windows monitoring