Added feature 3
added new feature!
Merge branch 'feature_3'