Location debuging
Merging branches