new option and better test for #39
looks like fixed #40