merge options
tilde?
Merge pull request #897 from vohof/patch/01

merge with default options