Updating VS 2012 solution after merge #26