updates from Clearwave
upgrading solution to VS2013