Add changes for release 0.9