Merge pull request #7 from farahfouladi/master

now?
Merge pull request #10 from lyeary/master

Merge pull request #7 from farahfouladi/master