Move class methods into ClassMethods module for better extensibility.
Merge remote-tracking branch 'arronmabrey/patch-2'
Merging with classmethods