fix issue #5 and add cucumber story about it