Initial commit - Ported code to VS2012