Play 2.2.x support added
cleanup