Merge pull request #9 from benticsay/master

Merge pull request #3 from keyanbagheri/master