Bump to v2.5.0

Closes #3 and Closes #31