Clarified second variable name.
Added q=0.X detection.