Slight refactoring and renaming of public methods
Merge branch 'master' of https://github.com/chriswoodrich/Kurbo