Fix location changing
Rewrite location add function and add tests
Merged @Wesley PR for WIP #31
Merge branch 'wesleylancel-location-fix'