Merge branch 'master' of https://github.com/aguinn/TitanPlayer.git