Changes for 0.2.5