Patch from Scott McKellar; use camelCase instead of under_score function names