Merge pull request #169 from mayah/windows-no-return