Bug Fix: Added support for unicode