Fixed Location short_name
Merge branch 'master' of github.com:tunacasserole/omni