closes #77 and closes #78