closes #96 #94