Shawn

Requesting to merge my changes with master.