Fix typo
Merge branch 'shaunwarman-master'
Update site