More Play -> Yalp changes
Merge pull request #43 from igmar/GH-22

More Play -> Yalp changes