bug fixes class names
Merge pull request #1 from christianurich/master

bug fixes class names