Wstring fixes
Merge pull request #180 from vomikan/master

Wstring fixes