address issues #57 and #72

somebody needs to test this on windows