format EOF
Merge branch 'issuesCorrection'