Kenny

Merging changes from John and Kenny to Master