bug fixed v1.1 production
resolve merge conflict
added notes, code complete