use correct namespace for underscorer and remove merge garbage.
Merge branch 'develop'