closes #331