Merge pull request #16 from farahfouladi/master

Merge pull request #42 from lyeary/master