Modifications to remove generics related warnings
Merge branch 'master' of github.com:Flipkart/phantom