fix allowing underscores in object name
Merge branch 'hotfix/0.1.1'