issue #13 - fixes for windows