changed and added some comments
Merge branch 'WorkBareus'