merge
Merge pull request #7 from ahmadajmi/master

merge