Serve assets dynamicaly
Merge branch 'hotfix/2.0.3'