add new feature
Fix bug
Merge branch 'NewFeature'