closes #315