Fix those pesky edge cases!
Merge branch 'master' of github.com:nkp/hackkings