Chris

Merge chris's changes into master.