Z-Scan Measurement Technique for non-Gaussian Beams and Arbitrary Sample Thicknesses