Closes #355