Removed enums with classes
Merge branch 'master' into HEAD