id's can't have underscores
Merge pull request #371 from jplock/patch-2

id's can't have underscores