fixed location bug
bug fix
Merge branch 'master' into release/demo