Feature2/user story 22

Merged Louis Cheung requested to merge feature2/user_story_22 into master

Merge request reports