fix/pull-request-17-comments