This commit closes issue #30