Import from old wiki
Merge pull request #1 from eguaj/master

Import from old wiki