This commit references issue #8