issue #14 - fix comments