Minor adoptions to reach the linked targets
Merge branch 'master' of github.com:PeteManchester/MediaPlayer