Correcting issues
Merge branch 'master' of https://github.com/Xenophiliac42/Flexible-Survival