Code from Tasks 1-4
Unicode Fixes
Merge pull request #3 from mapthegod/tasks_1-4

Code from Tasks 1-4