fix story bug
merging origin branch

Merge branch 'master' of https://github.com/cdcueva/oliwi into story_fix_bug
Merge pull request #105 from cdcueva/story_fix_bug

Story fix bug