Closes #278