Closes #281