closes #281 and closes #278