Final Fix, hopefully
Merge pull request #101 from cohart/master

:+1: