Merge pull request #128 from klausw-g/custom-circle-tweaks