Update to latest nightly
Merge pull request #184 from bjz/update

Update to latest nightly
Windows compatibility