Added VS2012 solution and extractor code tidy up