Fixed naming?
Merge pull request #37 from JoahG/master

Fixed naming