Added the Sun
Merge branch 'development'
Completed