merging Derek into master.