correct class name
Merge branch 'issue-19' into develop