before pull 11/07
Merge origin/master
code commented. Completed final checks.