burntsushi
Merge pull request #55 from BurntSushi/master

Merging PR 55 from user BurntSushi