This commit closes issue #31