V1.1

Merging v1.1 with master