Third commit after review

wchar_t* changed to std::wstring