Pr/2

Merging for 1.1.0 release