Merge pull request #9 from jvandertil/vs-fix

Visual Studio fix