Also allow '_' and '-' for language codes

Closes #6