closes #325