Merge branch 'release-1.1'
Added feature #3