Added issue #45