Patch Release 2.2.1
Merge pull request #585 from bhariharan/master

Patch Release 2.2.1