Change from snake_case to camelCase

Change with more selected sed use.
CamelCase updates

updates
Merge pull request #33 from marshallshen/issue_25

Issue 25