updated for Play 2.1.3