Fixes for compilation with MSVC
Merge pull request #22 from xLAva/MsvcFix

Fixes for compilation with MSVC