merge dev, add expire command