fixed inheritance issue
Merge branch 'Entities' of https://github.com/tschicke/Cubes into Entities
minor changes