Merge pull request #2 from farahfouladi/master

pulling new code to lyeary repo