Play 2.3

Version of #2 and #1 created for correct branch.