Updated for version 0.9.125
Merge branch 'master' into 9125
Merge pull request #20 from rahulj51/9125

Modified for changes released in version 0.9.125