fixed feature 2
Merge branch 'new-feature-2'