Story2 Completed
Story1 Completed
Merging to master