Change user location
Merge pull request #17 from thulioph/master

Change user location
update method create map
adjustments conflict