Merge pull request #67 from onkar-dhuri/2.2

Minor fixes