task1: added story1 functionality
Merge branch 'Story1' into develop