Merge pull request #2 from farahfouladi/master

pulling new code to lyeary repo
Merge pull request #5 from lyeary/master

Merge pull request #2 from farahfouladi/master