fix generator directory based on namespace
Merge branch 'hotfix/1.0b4.1' into develop