modified to accommodate locations
Merge pull request #4 from mercyint/master

modified to accommodate locations