changed the classname to prevent conflicts
Merge branch 'release/0.5.1'