Merge pull request #69 from fdelapena/master

iconv: use SHIFT_JIS instead of CP932