Merge branch 'fix/py3x_win-amd64' (closes #199, #208)