Preparing for new release!
Sync to v0.2.5
v0.2.5 release