Merged with master
augmented comment
author
Edit