bug fix v1.1
resolve the conflict and merge
add Notes, coding complete