Fix namespace violation
Merge pull request #1 from dereuromark/master

Fix namespace violation