fix bug01 in branch bug01
fix more in bug001 branch
merge bug001 branch again
master on 2