bug fix, v1.1 for production
bug fix, v1.1 for production
resolve merge confilt
added notes, completed coding