ADDED: some assets.
Merge remote-tracking branch 'origin/master'