fix for MSVC
Merge branch 'master' of https://github.com/Sophen/cryxor2013-2