Nightly fix
Merge pull request #30 from Coenego/nightly-fix

Update for the staging environment