Added the intial solution to work on TFS 2012