Closes #249