Merge pull request #58 from andylyall/develop

Develop
Include windows images