Player fix - not perfect, but almost
Player fix - almost perfect
Merge branch 'master' of https://github.com/jptr/HipMeBeta2