Fixes #80
Merge branch 'fixes/asset' into develop