Closed #244 and #250.