Merge pull request #56 from visit1985/cygwin_fixes