Upgraded project to VS2013