Less diplomatic

Merging branch to master.