This commit references issue #9