Address issue #43 and possibly #21