remove restrictions on option names
remove imports
version bump