Fixes #120
Merge branch 'fixes/extension' into develop