changed locations
Merge pull request #2 from lbtran/master

locations