Added support for play2
merge