Add CircleMarker and clean-up Circle
Merge pull request #3 from jtreml/add-circle-marker

Add CircleMarker and clean-up Circle