Fixes #19
Merge branch 'feature/extension-runtime' into develop