Closes #357