Removed the strikeouts
Merge branch 'master' into master_clean