closes #367