fixed bug version1.1
resolve merge conflict
added notes, completed coding