Allow _ in package name

Fix #1311
Merge pull request #1312 from bootstraponline/fix_regex

Allow _ in package name