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

id's can't have underscores