Add changes in 0.2.6