Attempt to fix #2 - needs to be tested on Windows