Kyle7

Merging with master