Added support for custom assets
Merge branch 'develop' into user