use assets
Merge pull request #1300 from affektive/use-assets

use assets