Some tweaks to add as a windows service
Merge pull request #686 from cfitz/master

Some tweaks to add as a windows service