Add comments to main source
Merge branch 'documentation' into develop