Adds strict option
merged