Updated with features from 1.1.0