Speed up/refactor location selector
Merge branch 'master' of github.com:loopyz/Spire