Merge UserStory 2 in master