v1.2.1 2013

Put back together with new Visual Studio project to fix errors in
previous commit