close fix
Merge pull request #22 from Velaport/let-826

Let 826
Merge branch 'staging' into production