Fixed builds and unit tests on Windows.
Merge branch 'master' of https://github.com/assassini/void
Merge branch 'master' of https://github.com/assassini/void
Cleanup.