updated for play 2.2.1