Merge pull request #8 from benticsay/master

Merge pull request #2 from keyanbagheri/master
Merge pull request #3 from keyanbagheri/master

Merge pull request #8 from benticsay/master