stop breaking up options after "--" is hit
version bump
fix merge