Apply revisions from @aysylu
Add link to infoq talk