Issue16

Modification for Issues #16 is finished.