Merge pull request #7 from steinwurf/fix-for-msvc-12

fix for msvc 12
fix warnigns on windows