Issues #16 and #72