Origin/extend expire date

maybe has not to be merged, redounded with #150