Merged Gabs branch
Merge branch 'master' of https://github.com/william-fiset/Survival