Fixing class name, using strtolower
Merge branch 'hotfix/v0.1.28'