Use "cls" for @classmethod instead of "self"
Merge pull request #947 from legoktm/p2

Use "cls" for @classmethod instead of "self"