Additional changes in Class Design
Merge pull request #7 from rbrueckner93/ruben

Additional changes in Class Design