made code work for play 2.2 + release on github