VS 2012 Support

Pull request test from dave to peter.