Added issue #22