Added location watcher (fixes #7)