Bug Fix v1.1 for Production
Resolve merge conflict
Added Notes, Completed Coding