resolved merge conflict
Documentation added
Bugfix !

with a dirty hack but it works