Added support for -location
2 files changed