refactor
Merge pull request #7 from ulberge/refactorplayer

refactor