fixed the bracket identation
Merge remote-tracking branch 'origin/master'
fixed the method to get the current user position
Merge remote-tracking branch 'origin/master'