Adding functionnality asked on Issue #21