continued with the story
modifed
Merge pull request #7 from hackfoo/master

continued with the story