(fix) Improvements to queue logic, more resolution on player state. Still has bugs
Merge pull request #78 from jgladch/fix/queue

(fix) Improvements to queue logic, more resolution on player state