closes #369