adding some changes in master, for merge conflicts.