closes #332