Fix some quote issues
All underscores to camelCase
Merge pull request #6 from michaelw90/master

Fix Nate's issues.