Improvement of Documentation concerning:
#24
#6