Closes #345