Made compatible with VS2013