Updates for version 0.9