making changes for feature #2
Merge branch 'feature_2'