Merge pull request #58 from Jtfinlay/master

User perspective implementation
Sick of these goddamn hyphens in my goddamn app