add story 4
bug fixing in use case 4
Merge remote-tracking branch 'upstream/master'