Closes #463