a new cool feature
muahahaha
Merge pull request #1 from tomjakubowski/feature

a new cool feature