Updated solution to VS 2013 and Windows 8.1