Fixes #25
Merge branch 'master' of https://github.com/libertyernie/brawltools