Better argument handling on Windows; Issue #9