closes #351