fix-send-to server and markers
Merge pull request #137 from dentrifonov/marker_fixes

fix-send-to server and markers