Fixed demo url
Merge branch 'master' into develop