elif is better than an additional if
Merge branch 'master' of github.com:ahawthorne/bungler