Closes #493