added and deleted some code in order to be able to build the solution on different versions of VS