include changes from contributors