Fix the class namespace.
Merge branch 'release/1.0.1'
Merge tag '1.0.1' into develop

Version 1.0.1