added new features
finished working on new feature
Merge branch 'new_feat'