feature 2 work is completed!
Merge branch 'issue-2-feature-update'