new version, cleaner
Merge branch 'master' of https://github.com/dgomes/MELGA