- Merging in changes to allow compilation in visual studio.