wtf
merge conflict
shortens method name
Merge pull request #5 from Stephenitis/stephen

Stephen