Close #95, or at least this will do for now