Changes made related to PR #26 feedbacks