bug fix, v1.1 for roduction
test
added notes and complited coding