Merge pull request #8 from lyeary/master

Merge pull request #5 from farahfouladi/master
Merge pull request #6 from farahfouladi/master

Merge pull request #8 from lyeary/master