Merge pull request #18 from jrmontag/master

Here's your freakin pull request