This should address issue #73