More globe changes. Refactored a bit, transformed lines to circles
Fixed merge conflict
Merge pull request #21 from rjbernaldo/globe-marker

More globe changes. Refactored a bit, transformed lines to circles