change - to |
Merge branch 'master' into home_page