Merge pull request #22 from farahfouladi/master

mergggggge
Merge pull request #49 from lyeary/master

Merge pull request #22 from farahfouladi/master