Added issue #33