closes #260