story 1.1

issue#92  @kalamoni  @andrewkhouzam  @abdelrahmansakr