Actualized comment
Added commentaries
Fixed names ambiguity
Fixed typos
Merge branch 'header' into l_tables