Allow _ in package name

Fix #1311