<ocd-rage>Typo</ocd-rage>
Merge pull request #32 from connor4312/patch-1

<ocd-rage>Typo</ocd-rage>
Fix merge conflicts