Merge pull request #123 from oxylusengine/msvc_fix