Implemened #111

Hi @dbu, this was just a quick shot .... wdyt ?