Merge pull request #19 from farahfouladi/master

Merge pull request #45 from lyeary/master
Merge pull request #46 from lyeary/master

Merge pull request #19 from farahfouladi/master