Develop

Closes #192-197, 213. Allows development in VS2010.