Added issue #9