bug fix, version 1.1
resolved merge conflict
added note complete coding