Work on Windows hack
Merge pull request #22 from jetty840/dnewman-merge

Work on Windows hack