Merge pull request #43 from lyeary/master

Merge pull request #16 from farahfouladi/master