feedback applied
Merge branch 'master' of https://github.com/peaceful-lukas/Catch-Up