Improved robustness of Windows scripts.
Merge branch 'master' of https://github.com/sparist/Om