Edit comment now can change location
Merge branch 'Costa'