Fixed example address across entire project
Merge branch 'master' into Mac