Merge pull request #111 from sylvaindeloux/master

Fixed namespace