fixed #1 as well as corrected some character encoding issues between Unix and Windows