Fixing gmaps
Merge commit '1f8e96f'