Added issue #35