please merge into master

review for: extended description here. I do not know what to write here