Bug fix ver1.1 for production
Resolve merge conflict
Added notes completed coding