20141206 - Refactored for Unicode