Added JeroenVermeulen_Solarium
Resolve conflict