<Stuff happened>
Merge pull request #33 from JacobLawson/master

<Stuff happened>