closes #277 and closes #284