WIP:Play support and resolve #20