Fix for non-MSVC compilation
Merge pull request #22 from Gaerzi/master

Fix for non MSVC compilers.