Added class attributes
Merge pull request #21 from teodozjan/master

Added class attributes