Closes #253