Merge pull request #14 from farahfouladi/master

Merge pull request #40 from lyeary/master
Merge pull request #41 from lyeary/master

Merge pull request #14 from farahfouladi/master