Updating for release 2.5
Merge pull request #241 from casharma/321-release

Updating for release 2.5