closes #95, #73