Added option for issue #29