Adjusted locations
Merge pull request #120 from pelegri/master

Adjusted locations