Ref #225 updates the email with some bug fixes.