Improved code with suggestions of comments of previous PR and synch with
current master branch