Adds #88 and #168.