closes #269