Fixed typo.
Merged old master into branch in order to make multiple-clients the new master.
Fixed id in how-to-#1 section.