Fixed a bug that caused namespace error
Merge branch 'release/0.11'