Now uses current location
Merge branch 'master' of github.com:scottrice/Mosaic