Merge pull request #1 from sheniff/master

Temporary assets