Fix namespace errors
Merge branch 'release/0.2.1'