Added issue #49