re #91 : Use dynamic namespace paths.
Merge branch 'feature/class' into develop