#43 refactor code structure
#43 add suport line