Merge remote-tracking branch 'upstream/master'
Allow underscores here too
Merge pull request #9 from jondkinney/allow_underscores_in_the_other_place

Allow underscores here too