updated to work with Play 2.2.0 (maybe)