Fix: Class is undefined
Merge branch 'hotfix/73'

Close #73
Merge pull request #74 from localheinz/bugfix/undefined-class

Fix: Class is undefined
Merge branch 'hotfix/74' into develop

Forward port #74