Location improvements
Location improvements
Merge branch 'master' of github.com:bcorrigan/Goat