2 last commits were not complete, here comes the complete stuff (hopefully ;-)