bug fix, release version v.1.1
resolved merge conflict
added notes. completed coding