Closes #284