bug fix for verion 1.1
resolve merge conflict
completed codind