Updated to play framework v2.1