Merge pull request #23 from onkar-dhuri/2.2

Moved custom changes to 2.2 branch