Bump to 2.5.0
Merge pull request #9 from selckin/master

Bump to 2.5.0