Added ids; see issue #33.