Added feature1
Added feature2
Merge branch 'master' into features