Taking into account remarks from PR #547