added new feature on new branch
enhanced the new feature and fixed some issues
Merge branch 'newFeature'