Merging 0.9.0 - fixing problems