more changes
Merge pull request #2 from fkassam/story2

more changes