Merge pull request #39 from lyeary/master

OMG FUCK YES
Merge pull request #13 from farahfouladi/master

Merge pull request #39 from lyeary/master