Merge pull request #4 from mlantz/pretty_and_close

Merged circle & marker code