Issues #16 and #72

delete this line