squashing #28 (need to test committed version on Windows)