Code should now be fully compatible with MSVC10