Updated the class as per #72, attached interdiff for same