Merging 1.0 features to 1.7.2