Add credit + bug fix + documentation