updated to make compatible with Play 2.2.0 (maybe)