Commit 3116718689c5a0af87b17b07d3b4cefbb57b974e

eustas 2016-06-17T16:39:00

Merge pull request #379 from eustas/master Fix VS build problems