added simple geo fencing
Conflict Commit