gitignore more win32-related files
Fix error message
Added exception handling (handles iconv errors)
Merge remote-tracking branch 'remotes/origin/master'