Pulled in the changes from spumko/crumb