Closes #413