Version 0.2.5

Change-Id: I083eca93f4969fa9c2d157da39f342de62cf5fd6