Merge pull request #158 from jwillemsen/jwi-vs2017ci