Close #239, #244 #245.

Implementation is finished.