Include extra options provided by user

Merge.