fix bug1
add feature1
fix bug2
add feature2