add new feature
Merge branch 'newFeature'