bug fix, v1.1 for producton
resolse merge conflict
added notes