added new switch for day and night
Merge branch 'nupp'