Merge 1.0.1 changes for 1.1