Cross-folder updates
Merge branch 'master' of https://github.com/adamclayman/lifesavers