Control circle styles by CSS class.
Merge remote-tracking branch 'origin/master'