Added issue #30