Resolve undefined butts issue
Merge remote-tracking branch 'upstream/master'
Merge pull request #4 from CraigSnowden/master

Resolve undefined butts issue.