fixed location bug
Merge pull request #26 from maxschaf/Location_branch

fixed location bug