[FIX] VS2013 compile fixes
Merge pull request #785 from timosachsenberg/fix/VS2013CompileFix

[FIX] VS2013 compile fixes