another one of those 'last week i learned' commits
Merge branch 'master' of github.com:1337/yesterday-i-learned