add-popup-to-marker
merged master and popup branch