COMP: Changes needed to build with Visual Studio 2010
Merge pull request #99 from BRAINSia/WindowsFixes

COMP: Changes needed to build with Visual Studio 2010