bug fixed. Ready for V1.1
resolved merge conflict
added notes. Complited coding