Updated Class and description
Merge pull request #63 from maennchen/dev

Updated Class and description