Closes #346