I updated modification of #106 and #47.