ADDED: did my own merging to get the play feedback working
UPDATE: work