correct namespace
Merge branch 'issue-19' into develop