fix package and add option