closes #70 and #69