Improving sustainability development in energy planning and optimisation. (15th December 2016)