Added issue #29