fixed
added a feature
Merge branch 'NewFeature'