Merge pull request #167 from GregOriol/master

Fixed namespace