User-story-3 finished
Merge branch 'user-story-3'