merge to ver. 0.4.6