Updated for Play 2.2
Fixed issue
Merge pull request #1 from codders/master

Issue fix / workaround