Converted to use regular strings internally and upgraded to VS2013