implemented story4
Merge branch 'feature/story4' into develop