Closes #484