Last changes to adapt to wiki description
Merge branch 'master' of https://github.com/lrodero/onodrim