Closes #431