Closes #257