Merging
Bump version to 0.4.25