Take my version 2.0 changes in

Hi Patrik,
as requested :)
Cheers,
Steve