Closes #251