closes #362