Merge pull request #135 from fly-man-/master

Reverting the Sun Changes