Fixed namespace conflix issues.
Merge pull request #40 from ronxin/master

Fixed a potential namespace conflicting issue.