Fixing empty class error
Merge branch 'hotfix/0.1.1'