Merge pull request #107 from rvandermeulen/msvcc