Added more comments
Merge branch 'devel'