closes #345