Added dot and circle.
Merge remote-tracking branch 'origin/master' into Jonas