improved solution and added vs solution and proj

Change-Id: I774108ca17995c8b241c19db0017be9a33239593