Issue #164 - fixing bug
Issue #164 - finalizing the story