Changs updated
Merge branch 'master' of https://github.com/max2buzz/Vicinity
Final changes