added Player
added timeout to starter
Merge remote-tracking branch 'remotes/origin/master'