Location Remembering #2

Open
uplime wants to merge 2 commits from (deleted):master into master