adds support for windows 8
Merge branch 'develop'