story #49

Story #49 completed

Signed-off-by: Talal Arshad <talal7860@gmail.com>
some changes in style