minor improvements
circular image
Merge remote-tracking branch 'upstream/master'