updated for play 2.1.3