ticket:13 commit with test fail
ticket:13 commit with test and code done
Merge branch 't13_understand'