Fixing class names
Merge branch 'release/1.0.2'