bug fix v1.1 for production
resolve merge conflict
Added notes, completed coding for this branch