Updated to Visual Studio 2012
Refactored