Worked on location issue
Merge branch 'master' into steven