Add the new feature  part of issue#139