Merge pull request #4 from vokal-isaac/master

One last tweak before tagging, I think