Merge pull request #15 from antillas21/develop

Develop
Setting expiration for assets. Take 1