Import from wiki
Corrected remarks from review
Merge pull request #1 from eguaj/master

Import from wiki