Feature 2 added
Feature 3 added
Merge branch 'dev'