story3 implemented
Merge branch 'story3'