Merge pull request #7 from farahfouladi/master

now?