Issues #16 and #72

already there