Fix of class names
Merge pull request #41 from marcinlawnik/develop

Fix of class names