added utf-16 version of file uploading
merge with master