Merge pull request #84 from edrocksit/master

Compile on windows
authors: add Ed