Merge pull request #2 from tyler-weeres/player

Player