Closes #349