bug fix v1.1 for test
update cool thing
resolve merge conflict
added notes, completed coding