This commit references issue #24