Closes #325