v0.025

    Re-release, did not merge changes for 0.024 release