Added missing class parent
Corrected incorrect class name in documentation
Merge branch 'hotfix/0.1.1'