Merge branch 'master' into feature/demo
Fixed image path issue.
Merge branch 'feature/demo'