training tryouts branch to master #3

Open
pfeiffer wants to merge 2 commits from training_tryouts into master