Closes #308