Feature 1 added
Merge branch 'feature1'