Merge pull request #1 from mweitzel/split_player

Split player
Merge branch 'master' into split_player

* master: