Non-Uniformity Measurements of a Steady State Solar Simulator Using the Hishikawa-Hashimoto Method and Subsequent Improvement