Added changes that mirror the discussion on srclib-python