Upgraded to 2.3.1
Merge pull request #1 from gunjaag/upgrade_to_2.3.1

Upgraded to 2.3.1