closes #241