Closes #94 and closes #95