Added unicode support, removed extra function.