Builds with MSVC again
Merge pull request #33 from sradomski/master

Builds with MSVC again