Namespave update
Merge branch 'release/0.3.7'