Error free player
Merge pull request #2 from ILoveSwitzerland/player

Error free player