Merge pull request #2 from keyanbagheri/master

Merge pull request #7 from benticsay/master