Add bug fixes dealing with changing instance variables to class variables.
Merge pull request #2 from danwu87/master

Added camelCaseToUnderscores
Add fixes to bugs.
Fix merge conflicts.
Add some stuff.
Merge remote-tracking branch 'upstream/master'
fake commit