Merge pull request #7 from keyanbagheri/master

-
Merge pull request #17 from benticsay/master

Merge pull request #7 from keyanbagheri/master