Improved circle detection