Merge pull request #5 from farahfouladi/master

main1 working from farah to lyeary
Merge pull request #8 from lyeary/master

Merge pull request #5 from farahfouladi/master