implemented partially the changes suggested in pull 226