Bug fixed version 1.1 for Production
Resolve merge conflict
added notes completed coding