This commit also fixes #7.  Well, in a way...