Merge branch 'hotfix/0.0.4'
complete name for the class
Merge branch 'hotfix/issue-mpj' into develop