JOELwindows7 [skip ci] Merge pull request #45 from Perkedel/sammer-wehe