Changes to text
Merge remote-tracking branch 'origin/Zack'