added features to 1.1.0
Merge branch '1.1.0'