This should close issue #4