Added ruler tool, and improved circles detection