Resolves #32 and also fixes #7.