closes #374