Closes #351