General: Fixes for compilation under vc++10
Merge pull request #139 from Astron/vs-fixes

General: Fixes for compilation under vc++10