Merge pull request #31 from lyeary/master

Merge pull request #11 from farahfouladi/master
Merge pull request #12 from farahfouladi/master

Merge pull request #31 from lyeary/master