Fix for camel case/underscore function inconsistency
Merge branch 'kyle'