Location equals function added
Merge branch 'fix-loccomp' into develop