commit to solve merging issue
Merge branch 'master' of https://github.com/letcheck/locateit.git
fix