Namespace fix #589

Merged
zxq9 merged 2 commits from namespace-fix into master 2019-06-27 16:34:49 +09:00