addresses #90 and #93