Closes #20

Of interest to issue #65