Updated to VS2013 & added socket handler