stash
[Issue #132] Rename classes
Merge branch 'feature-expl' into develop