Fixes issue #12 with more options.