Upgraded version to 0.9.x