more comments
Merge branch 'presentation_branch' of https://github.com/3Dwe/master into presentation_branch