Using the @classmethod approach

Should fix issue #37