Lights [#35]
Fixed merge [#35]