commit fix01
added comment by master
merged with fix01