Added issue #21