Added issue #13