Merge pull request #79 from ferd/bump-2.5.1

Bump to 2.5.1