Added feature 4
Merge branch 'feature_4' into develop