20141109 - Refactored for Unicode