Merge pull request #26 from lyeary/master

Merge pull request #9 from farahfouladi/master