Upgraded solution to VS2013