Changes to the class as per reolution in Git #138