Updated to include most of the changes in 0.9.0