Workaround for bug in Visual Studio
Merge pull request #285 from peastman/master

Workaround for bug in Visual Studio