Merge pull request #37 from onkar-dhuri/2.2

Minor fixes in entity generation