Fixed story 18
Merge pull request #131 from buren/Story18Fix

Fixed story 18