Merge pull request #79 from visit1985/wchar_support