Fixes #88
Fixes #87
Merge branch 'fixes/core' into develop