Moving to version v1.1, refer to changelist for changes
Merging v1.1