Merge branch 'hotfix/schema'
Fixes #30
Fixes #31
Merge branch 'hotfix/bugfixes' into develop