fixes namespacing issue
Merge branch 'issue-118' into develop