adding changes done for 3.2.1 release
Merge pull request #1 from chanikag/master

adding changes done for 3.2.1 release