Also fix #20, but for some reason this file didn't get added to that last commit.