fixed typos
Merge branch 'staging'