Merge pull request #2 from cornguo/master

Fix possible iconv errors by ignoring invalid characters
fix typo