Merging 1.0 features to master