edited some comments

fixed bug from issue #155.
Merge branch 'WorkBareus'