Issue #3 - Update project to 2012