Merging Ken into Master

Edited Master View.