issue #14 - fix comments (refresh branch)