addresses #160 and #159