test
Merge remote-tracking branch 'origin/master'
fixed some typos
removed test text