closes #258