Bug Fix v1.1 for production
Resolve merge conflict
code complete