Preparing to release 2.5.0.CR1.
Merge pull request #14 from pedroigor/master

Preparing to release 2.5.0.CR1.