Add second feature
Merge branch 'release/1.1.0'
Merge new feature from original