Prepares for merge
Merge branch 'master' of https://github.com/khreenberg/my-champ.git
Fixes merge errors