closes #308