added check for unicode
Merge branch 'master' of https://github.com/Thesis/Core