sun position function correction
merge conflicts