Merging in final 1.1.0 changes