Added issue #47