Fixed #66 as requested by M.Albersten - thanks