Added issue #42