Finishes fix for #16
Merge pull request #19 from JoahG/patch-1

Finishes fix for #16