bug fix, v1.1 for production
reslove merge conflict
added notes, completed coding