Merge pull request #329 from zach-is-my-name/patch-2

Merge pull request #329 from zach-is-my-name/patch-2 #198