Fix for classes with compost names
Buping version to 2.1.0