closes #346