Added support for marker icons and InfoWindows