Converted to Play 2.1 project