Merge pull request #88 from weltling/master

Several MSVC fixes