Ryan

Merging Ryan's changes with master.