This commit covers issue #61