closes #285