Added option to enable R*Tree