Merge pull request #20 from bbarker/master

minor fixes
needed in Cygwin